From: Mark Brown Date: Wed, 27 Nov 2013 16:37:21 +0000 (+0000) Subject: Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~7270^2~4^6~1^2~1^2~3 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=85cfe6b64d785b170367322d9d130a530db7b276;p=linux-4.9.git Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar Conflicts (removal of an error handling fix due to devm conversion): drivers/spi/spi-rspi.c --- 85cfe6b64d785b170367322d9d130a530db7b276